Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 6 Jun 2011 17:58:07 +0000 (10:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 6 Jun 2011 17:58:07 +0000 (10:58 -0700)
commit170950d08081ebe0fee0db89e95742107a21ff10
tree01479de5cab3dce036d31fe3ad3339cc4e629c4b
parent965c700949277c9431cf69a11ff65c2fadd34221
parent75f764e39f82ff725acd828045bb5b68be587c32
Merge from trunk.
src/ChangeLog
src/alloc.c
src/lisp.h